Merge changes from topic 'am-c58363b2-325e-41bd-baab-3a46a1cb158f' into ub-launcher3-master

* changes:
  Handle back-to-back height reduction animations am: 24ba787ded
  Handle back-to-back height reduction animations