Merge "Change default disconnect tone to ToneGenerator#TONE_PROP_PROMPT"