Merge "Keep lightRevealEffect and lightRevealAmount up to date" into sc-v2-dev