Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev