Merge "Fix rpi touchscreen support on master"