Merge "RCFilters: Work around Chrome browser bug in filter menu"