Merge "Add lock task checking to moving tasks to back" into lmp-dev