Merge "Flag new Credential Manager settings intent" into main