Merge "Apply font size scale to markup text" into devel/master