Merge "Change RenderEngine::drawLayers to take a vector of LayerSettings pointers"