Merge "Differentiate per-layer saturation levels" into rvc-dev am: be3b2304d2 am: c95a9a4520 am: 225f2883e0

Change-Id: I036639e76de1f0024690584439d6bb6be5da2925