Merge "b/5080166 support multi-touch on external touchscreen."