Merge "Prevent new patchset notification emails for trivial rebase"