China, India border dispute back in focus