Merge "Fixes activity not resumed after applying WCT" into main