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

Change-Id: Id375f5c6462e3148c629067d86079ba802d27aeb