Merge "Persist snoozed notifications after restart"