Merge "Allow internal service to add or remove a TileService" into main