Merge "Fix TunerFilterSetting union usage"