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

Change-Id: Ia90daaeffe6510a37f9bb39619a4814c999855ad