Merge "Fix selecting with touch in multi-window." into nyc-dev