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