am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev

* commit '013d14f887a8b317d60bd65fa3d3bbb215095cb4':
  Make lock task check if focused better