Merge "(Text Controller Impl) Moved event handling related methods into a separate...