Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev

* changes:
  Don't allow the overflow bubble to be dragged out.
  Fix inability to return to selected bubble after opening overflow.