Merge "Remove TileServiceManager dependency from CustomTileInteractor" into main