Merge "[elm_multibuttonentry]Changed edc's TEXT part to TEXTBLOCK to support ellipsis"