Merge "Avoid recomposing the QS scene every frame" into main