Merge "Fix jumping animation when using two-finger expand" into lmp-dev