Merge "Cancel outstanding user consent request" into qt-dev