Merge "Move assist gestures settings to overlay" into oc-dr1-dev