Merge "Fix assist gesture settings summary" into oc-dr1-dev