Merge "Fix test failures in AbsSwipeUpHandlerTestCase" into main