Merge "(Text Controller) Moved some input properties into a different class & some...