Merge "headphone volume limitation" into jb-mr1-dev