Merge "Implement legacy enter-pip2 w/o animation" into main