Merge "Make mUserAspectRatio final" into main