Merge "Refactor preference controllers to receive and mutate ZenMode/ZenPolicy" into main