Merge "App default has aspect ratio override" into main