Merge "Fix RemoveText code in text-controller.cpp" into devel/master