Merge "Recompute scrim alpha when enabling expansion" into rvc-dev am: 0c07fe50e9

Change-Id: I791ae513e06d85ada69d09fc1202424a17f644d0