Merge "Fix LightRevealScrim jank" into main