Merge "Hiding split shade media container when not needed" into sc-dev