Merge "Return true when keystrokes are handled in BaseKeyListener." into nyc-dev