Merge "Apply markup properties for pre-set text" into devel/master