Merge "Fix MultiTouchInputMapperTest failed"