Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev