Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: b5fe464e am: e6759f8e am: 092cb4f4 Change-Id: I4dda1130850070db53075d053be1cd40fe897773