Merge "The notification archive should follow history setting" into rvc-dev