Merge "[*][entry,label] add align property for sync with valign support"