Merge "Revert "Enforce a limit on the size of ZenModeConfig"" into main