Merge "OEM-configurable max screen magnification scale" into main