Merge "Clean up activityWindowInfoFlag (2/n)" into main