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

Change-Id: I41da85f130da89bb61971911fdf1ae19d25d7937