Merge "Micro-optimizations for qsFullScreen" into main