Merge "Fixed an issue where media could become invisible" into sc-dev am: b1fe28e2 am: 29fd0a39 am: 030be279

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15216093

Change-Id: I6be1d59195bc89e96e9297f077a3397f7e6d2019