Merge changes from topic "am-c2841e6a-5061-492f-abbf-dfb8b89ccc04" into ub-launcher3-master

* changes:
  [automerger] Fix some state issues with user-controlled animations am: 31fbd4c08b
  Fix some state issues with user-controlled animations