Merge "Differentiate per-layer saturation levels" into rvc-dev