Merge "Fix THD with max user EQ preset volume again" into jb-mr1-dev