Merge "The notification archive should follow history setting" into rvc-dev am: 64fb27fc am: afeda30e am: 45340650 Change-Id: If486a082c589ce2956dbe4cead24b8a9aac46738