Merge "Fix NPE in NotificationManagerService"