Merge "Disables failing tests in ChooserActionFactoryTest" into main