Merge "Fix crash in starting lock task"