Backport touchscreen improvements from N7100