Merge "Modify headphone volume warning message" into jb-mr2-dev