Merge "SF: temporary disable FlagManagerTest.returnsOverrideFalse" into main