am d3de7953: am e020af83: am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev

* commit 'd3de79538bc87e769e876866f38b8c9048940d4b':
  Fix bug where icon animation is sometimes skipped