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

* commit 'b0b16c1e5e48a81afebf5469f33f000fe999dbbc':
  Add lock task checking to moving tasks to back