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