Merge "Wait for current task to complete before revoking challenge" into qt-r1-dev