Merge "Add log about ChooseLockGeneric refusing to start"