Fixed compilation error on Mac
Merge branch 'dev-emulate-touchscreen' into dev