Merge "Don't show the user aspect ratio button for transparent activities" into main