Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev