Merge "set System UI visibility based on MediaController state" into ics-mr1