Merge "Use setFlags to disable two line toggle flag in tests." into main