Merge "make MotionEventInjector support multi-display"