Merge "Fix Assist Gesture settings check" into oc-dr1-dev