Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev