Merge changes I28127caa,Id6d59546 into main

* changes:
  MediaContainerView: Bind KeyguardMediaController visibility to MediaContainerView's visibility
  MediaContainerView: Log invalid visibility change