Merge "DO NOT MERGE Fix display freezing when screen size mismatches" into pi-dev
am: ab39f605b1

Change-Id: I949542f78ee47a2da613735498c3bf3f7d55e062