Merge "Handle back-to-back height reduction animations" into ub-launcher3-dorval
am: aaff476c3d

Change-Id: I31a2d3628fa2413d0c2bac4fc0b37c27a029b6d0