Merge "Add new layouting support for TextLabel and ImageView." into devel/master