Merge changes from topic "am-f87bd580-30d6-4da0-89bd-1568b32fd0ac" into ub-launcher3-master

* changes:
  [automerger] Don't end atomic animation when passing through state am: fc564f1477
  Don't end atomic animation when passing through state