Merge "SysuiTestCase mocks gantry FeatureFlags" into main