Merge "Ensure activity configuration when applying WCT with display change" into main