Merge "Make 'no notifications' work like 'manage/history'" into rvc-dev