Merge "Fix assist gesture settings summary"