Merge changes Ic91ff7ac,I7d118592 into rvc-dev

* changes:
  Fix some more snoozing bugs
  Silence notifications that are manually unsnoozed