Merge "Revert "Re-add notification history tunable""