Merge "Recompute scrim alpha when enabling expansion" into rvc-dev