Merge "Expose ZenMode kind (and simplify implicit mode creation in TestModeBuilder)" into main