Move more renderer construction code into RendererFactory

checking if variants are used and then which renderer to use
is more the responsibility of the RendererFactory.

Change-Id: I1857241f3b71308c32ba75ca6af49623c77e53cb
Merge "Move more renderer construction code into RendererFactory"