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