The visit brings to close 18 months of agonising diplomacy to repair a rift caused by David Cameron’s decision to meet the Dalai Lama