Merge "Moving ReorderWidgetsTest to an integration test instead of E2E" into main