Merge "(TextController) Refactored out Text updating methods & moved another method...