Merge "Revert "Add Credential Manager settings""