Merge "Revert "Revert "Use renderengine::drawLayers api everywhere."""