am b189cac5: am c23508e6: Fixes duplicate badges and animating text

* commit 'b189cac5ef8e48d66bf8a00e5afb590f6d7bf9f4':
  Fixes duplicate badges and animating text