Merge "RCFilters: Align TagItemWidget highlight in Safari"