Merge "Fix issue with pin prompt." into lmp-dev