Merge "Change the icon in the trigger segment for TYPE_DRIVING modes" into main