Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev