Merge changes I0f0307dc,I3ae3d407 into main

* changes:
  CursorInputMapper: move unit tests to InputMapperUnitTest
  InputMapperUnitTest: extract device creation from SetUp