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 am: e0b95fbe
am: 9d4e80e7

Change-Id: I013e6cb421820e144eed516fd001b16a6b7ebaf6