[DF-3220] Fixes for renderLayerManager