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