Merge "RCFilters: Explicitly set the default highlight color to null"