Merge "BUG-2288: deprecate old binding Notification API elements"