Merge "Unblock wait events when nci command timeout occurs"