Merge "Ensure the top-resumed-activity is updated after WCT applied" into main