Merge "Merge "Disable split screen aspect ratio for portrait apps in tabletop" into 24D1-dev am: 9154fe5c39" into main