am c23508e6: Fixes duplicate badges and animating text

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