Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: af43919c am: c4e7e655 Change-Id: I64651002f79cdf0dfa7464f0025e6cd481b8f78d