Surfaceflinger merge fix