Merge "Ensure light reveal scrim is fully revealed once we're unlocked." into tm-dev