Merge "Persist pending notification history on shutdown" into rvc-dev