Merge "Switch touch input device on hover events." into oc-dev am: 5a3361d2ed
am: b73fa1e5c9

Change-Id: I831a876a92fac33667f9063d0af34ef822c549a8