Merge "Fix pause when setting pin/pattern/password" into lmp-dev