Merge "sf: Make sure HWC_BLENDING_NONE is set for opaque layer"