Merge "Make sure datapath_type is updated on bridges changed"