Merge "Fix IME (key input) issues on Text control" into devel/master