Merge "TextController - Consume the key event." into devel/master