Merge "Activity orientation experiment on only large screens" into main