Missing Livy/Solr UI gateway url on Knox Home page

Even if Livy/Solr is added to a topology their service logos are not displayed in the UI services section within that topology. The reason is that they are marked as API services.

However, they are both API and UI services, thus their logos should be displayed in the UI services and their service URLs should be displayed in the API services section.