Merge "Fix for text controller (IMF callback)." into devel/master