Merge changes Iceb7c9cf,I1e802e67 into main

* changes:
  Fix NPE in LauncherSwipeHandlerV2Test.setup
  Update recents states sent to tests by RecentsWindowManager