Merge "Revert "Remove unused notification data"" into main