Merge "Fixes NotificationInfo for demoted notifications."