Merge "Make Settings aware of legacy user keys with secret key prefix"