Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be9 -s ours am: 7fe44227 -s ours am: 6858ba0b -s ours am: c8affe23 -s ours am: cc088355 -s ours Change-Id: I103b98c5b508a6034f07c5aae81373cb1fe5d28c