Backport notification fix to version 3.33
Created by: camdencheek
This backports the fixes we made to saved search and code monitor notifications onto version 3.33.
Patch release request here. I didn't realize
we had release branches, which is why I didn't make this until now