Merge "Disable diag in libinput" into tm-dev