Merge "Make sure scrims will fade from black" into qt-r1-dev am: bae4081329 am: 69a0103f65
am: b2eee95ec4

Change-Id: I2aa85f1a1fd97b14655ee1038d2454740ef23ba9