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

Change-Id: I0c9ef5ebce04c7a477b55570c4b39f71e8bba14d