Merge "Update to lock task features API" into pi-dev