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

* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
  Fix pause when setting pin/pattern/password