Merge "Fix bug with blinking caption tooltip on rocker click. Also clean up...

Merge "Fix bug with blinking caption tooltip on rocker click. Also clean up some older code that flashed the dialog on screen initially and triggered dismiss too often." into qt-dev