Merge "text-decorator to use ImageView instead of ImageActors" into devel/master