Merge changes I111361f7,Ic4979b91,Ic289d772 into tm-qpr-dev

* changes:
  Reset the touch state when the active viewport is disabled
  Fix issues with InputMapper tests
  Fix spot not disappear when display id changed