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