Merge "Added TouchProvider" into tm-dev