Notification improvements from mvp76

See !437 (closed), specifically this comment.

This is just a procedural thing whereby I wanted CI to pass with gradle lint before merging, but timezone differences would have caused a whole day round trip before we could get it merged. This would prevent me from updating other MRs and allowing them to get CR'ed.