Merge "Consolidate full-screen override and cache user aspect ratio" into main