Merge "Implement auto-enter PiP2 in gesture nav [5/N]" into main