Merge "[genlist] re-add item select & item update changes"