Merge "Remove unused conditional in TextController" into devel/master