Merge "Fix PIN/PUK flow" into lmp-dev