Merge "Fix RemoveText issue in text controller" into devel/master