Merge "Update patch status before skipping duplicate emails" into stable-2.6