Merge "[genlist_edit.edc] change edit mode edc"