Merge "Fixed energy computation for eq and bass boost" into oc-mr1-dev