Merge "Delay the PiP menu attachment"