Merge branch 'touchscreen'