Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main