Merge "Fix an likely ClassCastException in Notification.visitUris" into sc-dev