Merge "Temporarily remove volume haptic flaky test" into main