Merge "Restore DISABLE_NOTIFICATION_ICONS."