Merge "Add tests for merged InputDevice cases"