Merge "Fix light reveal state" into main