Merge "[elm_genlist.c] Merge upstream code."