Merge "Fix display freezing when screen size mismatches"