Merge "Add DISALLOW_CONFIG_LOCALE user restriction"