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