Merge "Fix crash in ChooseLockGenericFragment."