Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev