Merge "Deprecate boolean settings for haptic feedback and vibrate when ringing"