Merge "Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly" into lmp-dev