[automerger skipped] Merge "DO NOT MERGE Fix display freezing when screen size mismatches" into pi-dev am: ab39f605b1
am: 619bafd4c2  -s ours

Change-Id: I20a7727c8b6ed966d49893c6db0f6bc3d5753bfb