Merge "Refactor swipe-pip-to-home transition" into main