am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev

* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
  Fix pause when setting pin/pattern/password