Merge changes I3a11d974,I9aec11be into main

* changes:
  Fix QS in split shade
  Fix spacing of QQS when media is present in scene