Merge "Add multitouch to new touch architecture" into tm-qpr-dev