am 95b555fc: am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev

* commit '95b555fc90bcf73723aaee7757fc5aafd84adec4':
  Align the behaviour of different lock task modes