Merge "Fix assist gesture keyword" into oc-dr1-dev