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