Merge "Fix displaying of file diff if draft patch has been deleted" into stable-2.5