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

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

Change-Id: I1142455437b1c188cf3d62e7e56e9326d1f1c50c