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

Change-Id: I870ad25047f0371acd5fa1e8ddd234b6f5e11462