Merge "Add ENABLE_FONT_SIZE_SCALE property to text components" into devel/master