Merge "Only setCredentialRequiredToDecrypt if primary user"