Merge "Handle shift-enter key events." into nyc-dev