Merge "Make ControlsActivity translucent" into main