Merge changes Ib640add6,I168a14e1 into sc-dev

* changes:
  Bubbles don't hang off screen
  Only show the first 2 bubbles in the stack when collapsed