Merge "IME support for trackball and generic motion events" into jb-mr1-dev