Merge "Unify Aspect Ratio Logic in ActivityRecord" into sc-v2-dev