Merge "Fix for TextField clipping." into devel/master