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

* commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
  Fix pause when setting pin/pattern/password