Merge changes I99cd110f,I5630fc05

* changes:
  Revert "Stop injecting QSPanel everywhere."
  Revert "7/N Inject media hosts directly."