Merge changes from topic "am-5f0a0fef-5aba-4af5-b148-430430ddfffb" into ub-launcher3-master

* changes:
  [automerger] Fix bug where recycled BubbleTextView kept their badges. am: 5254944a68
  Fix bug where recycled BubbleTextView kept their badges.