Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master