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