Merge "Prevent crash when a TileService is uninstalled" into main