Merge "Return to OCCLUDED from canceled swipe if needed." into main