Merge "[DPP] Handle DPP timeout event correctly"