Merge "Revert "Address frozen notification API feedback"" into main