India, China's prickly relationship is undergoing subtle changes