Merge changes If3d6ea21,Iab8360f2

* changes:
  WindowInfo: Remove unused field portalToDisplayId
  InputDispatcher: Allow spy window to receive entire gesture after pilfer