Merge "Fix ZenModeRepositoryTest flag flipping" into main