Merge changes from topic "am-31a9fe88-a758-4cb8-adfb-88de2cbdae63" into ub-launcher3-master

* changes:
  [automerger] Fix some jank with transitions am: 118295e07c
  Fix some jank with transitions