Merge "Update media controls layout"