Merge changes Ia6a3506f,Ifc470bd1 into main

* changes:
  Preserve qsFullScreen update in NSSL
  Perform NLVM combines on the bg thread