Merge "Don't let NotificationMediaManager cause NPEs"