Merge "Remove the ZenModeSliceBuilder" into main