When Hardik Pandya comes back, India’s No. 7 and 8 will be sorted, says Shubman Gill