Merge "Make sure mFlags is synced properly in WindowConfiguration"