Merge "Support DISALLOW_CONFIG_LOCALE user restriction"