Merge "Disallow two finger gesture nav behaviors when the cursor is in the zones" into udc-qpr-dev