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

Change-Id: I30b556774bdd80b9dd41ffc82ee1a9750b6487ba