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

Change-Id: I10c6b0c4194dbeb3e2934f9c032bc53aea0d9c7e