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

Change-Id: Ia8c45c2e245f7f64fc99073a180589eafc9ae982