Merge "Add shell command to populate lock task option"