PCB extends Waqar’s contract until England tour