Merge changes Id0c3cf19,Id089db27,Ia4c0cbb8

* changes:
  Ensure returned event is non-null
  Stricter validation of motion events in dispatcher
  Add test for hover events over spy window