Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev