Merge "Tuning gesture nav params for trackpad 3-finger gestures" into main