Merge "Remove EnabledSince from OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY" into sc-v2-dev