Merge "device diagnostics: add multitouch support" into main