Merge "Use activity rotation if hasFixedRotationTransform and letterboxed" into 24D1-dev