canceling challenge if there is one present on destruction

[ldanzinger]

@GuillaumeBelz @JamesMBallard please review. Tested my repro on QML and C++ and went through the Security functional test app steps to ensure no regressions