Merge changes I4794ed89,I0c273f4d,Ibd8609a8 into sc-dev

* changes:
  Flexible maximum number of bubbles to show
  Add shadows back to bubble avatar
  Update sizes for the bubble avatar