Merge "Clean up recentChangesFlags rollups"