Merge "Add text wrapping hyphen mode support" into devel/master