Merge "Don't include flags in configuration change if their value hasn't changed."