Merge "Simplify trackpad multi-finger gesture recognition logic for gesture nav" into udc-qpr-dev