am e90cd233: reduce number of animations on state changes

* commit 'e90cd23338ac6aedde27559ddb1c4113d0bba901':
  reduce number of animations on state changes