Merge "Respect the expanded amount with AUTH_SCRIMMED_SHADE" into sc-v2-dev