Merge "Enable all aspect ratio options in UserAspectRatioManagerTest" into main