Merge "Fix 5958806: Allow play button to be hidden in TransportControlView"