Merge "Play original haptic when feature flag is off. Rename feature flag" into tm-qpr-dev