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