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