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

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