Merge "Advise use of InputDeviceListener when using pointer capture" into tm-dev