Merge changes Id3b3a12b,I1a2b4244 into main

* changes:
  Fix shadeExpansion being 0 when QS partially expanded
  Fix qsFullScreen when QS only partially expanded