Merge "Correctly show media player on split shade" into sc-v2-dev