Merge changes I2553a44c,Iba20051c into qt-dev

* changes:
  Test for ranking listener
  Dismiss any active bubbles when the channel setting is disabled