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

Change-Id: Ia038c298cde47638df9a965d900c7ae4cf1a8af3