Merge "WindowState: applyWithNextDraw fixes" into sc-dev