Merge "Move key attribute information into KeyEvent."