Merge "Reduce height of expanded media controls" into sc-dev