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