Merge "[surfaceflinger] Set blend mode correctly when using HWC2."