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

Change-Id: I53601e0d7d9f747a339f7db3a2d36a1dffa5bb38