Merge "Fix layer blending bug"