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

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