Merge "(TextController) Fixed SVACE errors in EventHandler" into devel/master