am 7dbbaf7e: Merge "Fix jank while unlocking and security is set" into lmp-dev

* commit '7dbbaf7edb12a92aa119dc23fa705a3fb405668d':
  Fix jank while unlocking and security is set