Merge "Don't crash the notification bind if the icon fails to resolve." into sc-dev