Merge "Support rounded corners in RenderEngine::drawLayers"