Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev