Merge "Don't cancel passkey entry pairing autonomously" into tm-dev