Merge "Fixed an issue where media could become invisible" into sc-dev