Merge "Support control of text alignment."