Added support for NC with no badge, better Apex support for badged central icons, other fixes/changes