Merge "Add missing lock task API" into lmp-dev