Merge "RCFilters: Init highlight button based on model state"