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

Change-Id: I627e338d55a7a7471a921daf5b1abf1dc54e41f5