Merge "Make sure to always fade the split shade media container" into sc-dev