Merge "Harden light reveal transition logic" into main