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

* commit '433d70d348a21a9f2f15c5357a14c3955b751915':
  Fix pause when setting pin/pattern/password