Merge "Hiding split shade media container when not needed" into sc-dev am: 0f6b5c97 am: 22882f42 am: 54fe0420

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

Change-Id: I9b922bad3345a95d38792a46d89a24c1deed8188