Merge "Revert^2 "Disable user aspect ratio button if app not launchable"" into main