null out callbacks after returned, increment until we have a safe call
Merge remote-tracking branch 'origin/related-2nd-click-failure-fix' into 2.6-April-6