Merge "ChooseLockPassword should not show "confirm" until min length is met"