Merge "Fix crash in ChooseLockPassworkFragment." into nyc-mr1-dev