Merge "Adjust falsing tests for flag rollout" into main