Merge changes I6129aff7,I7e21ee87 into sc-dev

* changes:
  Fix dot & badge being on correct side for the first bubble added
  Fix the dot not showing when it should