Merge changes from topic "397989775" into main

* changes:
  [Flexiglass] Replace media with new implementation
  Move things from ContainerViewModel to OverlayViewModel