Merge "Revert "Defer resume of activity while applying wct"" into main