Merge "Merge "Add multitouch to new touch architecture" into tm-qpr-dev am: fa87b00c96 am: f6a293ad6c"