Merge "The notification archive should follow history setting" into rvc-dev...
Merge "The notification archive should follow history setting" into rvc-dev am: 64fb27fc am: 58b32f89 am: 50e1d6c8 am: f350d7fc
Change-Id: I1f18f9d151ed3b69aa44c499a3b2f02498ed256e