Merge "Revert "Make mUserAspectRatio final"" into main