Merge "add flag for emergency calling notif changes" into main