Merge "RCFilters: Hide highlight containers when RCFilters is disabled"