Merge "Frameworks/base: Fix Notification code"