Merge "Add a hidden flag to control Settings UI"