Merge "Add Credential Manager settings"