Merge "Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: b5fe464e am: 4b654347 am: 16ad4531"