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

Change-Id: Ib65297c2061d23d9045e4f553f9d1d251d66e6a0