Merge "Add Delete Key event in TextController" into devel/master