Merge "RCFilters UI: Unify li bullets with and without highlights"