Merge "Add P2P dialog PIN length validation" into tm-dev