Merge "Fix ZenModeRepositoryTest failures" into main