Add touchMouseID to Enum
Merge branch 'master' into new-api