Merge "Revert "Temporarily disable ZenModeFiltering tests""