Merge "Implement diff haptics going into all apps" into tm-qpr-dev