Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev