Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev