Fix merge conficts, safer type checking along display notification execution path
Fix merge conficts, safer type checking along display notification execution path

vladzz/CRToast,kazmasaurus/CRToast,hulu001/CRToast,AdamCampbell/CRToast,hoanganh6491/CRToast,dmiedema/CRToast,hoanganh6491/CRToast,chinaljw/CRToast,iosdevvivek/CRToast,Adorkable-forkable/CRToast,cnbin/CRToast,yeahdongcn/CRToast,perrystreetsoftware/CRToast,leoschweizer/CRToast,maranik/CRToast,grzesir/CRToast,Trueey/CRToast,Kevin775263419/CRToast,Ashton-W/CRToast,mmmilo/CRToast,dedelost/CRToast,Kevin775263419/CRToast,gohjohn/CRToast,cruffenach/CRToast,Naithar/CRToast