Merge "Make sure scrims will fade from black" into qt-r1-dev am: bae4081329 am: 709394308e
am: 1f0f3f60da

Change-Id: I17bf5bfabb778e8552e620607c95810b30a1c5cd