Merge "RC Filters UI: 'restore defaults' clears highlight"