Merge "Fix gesture exclusion limit for sticky-hide nav bar" into rvc-qpr-dev