Merge "Remove universal touch boost" into tm-qpr-dev