Quick Edit: Thaw in India-China stand-off but tensions remain