Merge "Fix crash in NotificationManager when WP is off" into sc-dev