Merge "Text background support for TextLabel" into devel/master