Merge "[1/2][PiP2] Fix enter-pip for AE case" into main