Merge "Fix small font size text layout issue" into devel/master