Merge "Support showTouches on multi-display (2/2)"