Merge "Add support for non-linear ramping of master volume adjustment"