Merge "MediaRouter: Rename mVolumeControl and mPlaybackControl for consistency" into mnc-ub-dev