Merge "Change condition for entering in touchMode"

                mTranslator.translateEventInScreenToAppWindow(event);

            }

            // Enter touch mode on down or scroll, if it is coming from a touch screen device,

            // exit otherwise.

            // Enter touch mode if event is coming from a touch screen device.

            final int action = event.getAction();

            if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL) {

                ensureTouchMode(event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN));

            if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) {

                ensureTouchMode(true);

            }

            if (action == MotionEvent.ACTION_DOWN) {