Merge change 3748 into donut

* changes:
  Fix enter key and control keys in Terminal emulator.