Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev