Merge "SyntheticPasswordManager: fix naming of scrypt parameters"