Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev