Merge changes I72f64c5f,Id2cbd681

* changes:
  Add @Override annotation to onTouchEvent
  Use KEYCODE_UNKNOWN constant instead of zero