Merge "[multibuttonentry] modify button size"