Merge changes I53c7d59d,Ie45d9381

* changes:
  InputDispatcher: Don't split mouse events
  InputDispatcher: Refactoring to prepare for spy windows