Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev am: 1abc4503 am: 1f5a4106 Change-Id: I1f955cefe35ed0aadeedf5a5d6c52b4e13645a32