Merge "VV2 & MCV2: Move handling MediaControlView2 visibility logic to VV2"