Merge "Fix NPE in LauncherSwipeHandlerV2Test.setup (follow up)" into main