Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev