Merge "Move Tuner 1.1 new RecordFilterEvent fields into a separate struct"