Merge "[3/n] Define OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA" into 24D1-dev