Merge "Make MediaController use low profile system UI" into ics-mr1