Merge branch 'mrst-touchscreen' into next