Merge "API cleanups for Notification." into klp-dev