Merge "Refactor KeyEvent constructors." into udc-dev