Merge "Fixed an issue where media was transitioning oddly for split shade" into sc-dev