Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev am: 1abc45038b am: a5c11b4ae4
am: ed586b2c53

Change-Id: Iff2d3ecd045f6a7be23638b4407f85d2fdcafb6e