Merge "Quick fix for NPE in updateNotification()."