Merge "Skip noteAppKill if the attaching pid is unknown to us" into sc-dev