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 Change-Id: Ia658a621d1fb4d7aee7d87b0ab02b1e72f9620f6