Merge changes Iac34e9bc,I19c84ab5

* changes:
  Rename some variables in InputDispatcher_test
  Refactor filterInputEvent asserts