Merge changes I111361f7,Ic4979b91

* changes:
  Reset the touch state when the active viewport is disabled
  Fix issues with InputMapper tests