Merge "Notify both background call and foreground call about merge failure"