diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index c45eeda..bec80b1e 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -21,7 +21,6 @@
 #include "RenderThread.h"
 #include "pipeline/skia/ShaderCache.h"
 #include "pipeline/skia/SkiaMemoryTracer.h"
-#include "Properties.h"
 #include "renderstate/RenderState.h"
 
 #include <GrContextOptions.h>
@@ -215,12 +214,11 @@
             log.appendFormat("  Layer Info:\n");
         }
 
-        const char* layerType = Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL
-                ? "GlLayer" : "VkLayer";
         size_t layerMemoryTotal = 0;
         for (std::set<Layer*>::iterator it = renderState->mActiveLayers.begin();
              it != renderState->mActiveLayers.end(); it++) {
             const Layer* layer = *it;
+            const char* layerType = layer->getApi() == Layer::Api::OpenGL ? "GlLayer" : "VkLayer";
             log.appendFormat("    %s size %dx%d\n", layerType, layer->getWidth(),
                              layer->getHeight());
             layerMemoryTotal += layer->getWidth() * layer->getHeight() * 4;
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 8b07d1d..5d72523 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -18,6 +18,7 @@
 #include <GpuMemoryTracker.h>
 
 #include "AnimationContext.h"
+#include "Caches.h"
 #include "EglManager.h"
 #include "Frame.h"
 #include "LayerUpdateQueue.h"
@@ -494,6 +495,13 @@
     }
 
     GpuMemoryTracker::onFrameCompleted();
+#ifdef BUGREPORT_FONT_CACHE_USAGE
+    auto renderType = Properties::getRenderPipelineType();
+    if (RenderPipelineType::OpenGL == renderType) {
+        Caches& caches = Caches::getInstance();
+        caches.fontRenderer.getFontRenderer().historyTracker().frameCompleted();
+    }
+#endif
 }
 
 // Called by choreographer to do an RT-driven animation
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
index 5f8d7ad..cd21822 100644
--- a/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@ -18,7 +18,6 @@
 
 #include <cutils/properties.h>
 #include <log/log.h>
-#include <private/gui/SyncFeatures.h>
 #include <utils/Trace.h>
 #include "utils/StringUtils.h"
 
@@ -465,109 +464,6 @@
     return preserved;
 }
 
-status_t EglManager::fenceWait(sp<Fence>& fence) {
-    if (!hasEglContext()) {
-        ALOGE("EglManager::fenceWait: EGLDisplay not initialized");
-        return INVALID_OPERATION;
-    }
-
-    if (SyncFeatures::getInstance().useWaitSync() &&
-        SyncFeatures::getInstance().useNativeFenceSync()) {
-        // Block GPU on the fence.
-        // Create an EGLSyncKHR from the current fence.
-        int fenceFd = fence->dup();
-        if (fenceFd == -1) {
-            ALOGE("EglManager::fenceWait: error dup'ing fence fd: %d", errno);
-            return -errno;
-        }
-        EGLint attribs[] = {
-            EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fenceFd,
-            EGL_NONE
-        };
-        EGLSyncKHR sync = eglCreateSyncKHR(mEglDisplay,
-                EGL_SYNC_NATIVE_FENCE_ANDROID, attribs);
-        if (sync == EGL_NO_SYNC_KHR) {
-            close(fenceFd);
-            ALOGE("EglManager::fenceWait: error creating EGL fence: %#x", eglGetError());
-            return UNKNOWN_ERROR;
-        }
-
-        // XXX: The spec draft is inconsistent as to whether this should
-        // return an EGLint or void.  Ignore the return value for now, as
-        // it's not strictly needed.
-        eglWaitSyncKHR(mEglDisplay, sync, 0);
-        EGLint eglErr = eglGetError();
-        eglDestroySyncKHR(mEglDisplay, sync);
-        if (eglErr != EGL_SUCCESS) {
-            ALOGE("EglManager::fenceWait: error waiting for EGL fence: %#x", eglErr);
-            return UNKNOWN_ERROR;
-        }
-    } else {
-        // Block CPU on the fence.
-        status_t err = fence->waitForever("EglManager::fenceWait");
-        if (err != NO_ERROR) {
-            ALOGE("EglManager::fenceWait: error waiting for fence: %d", err);
-            return err;
-        }
-    }
-    return OK;
-}
-
-status_t EglManager::createReleaseFence(bool useFenceSync, EGLSyncKHR* eglFence,
-        sp<Fence>& nativeFence) {
-    if (!hasEglContext()) {
-        ALOGE("EglManager::createReleaseFence: EGLDisplay not initialized");
-        return INVALID_OPERATION;
-    }
-
-    if (SyncFeatures::getInstance().useNativeFenceSync()) {
-        EGLSyncKHR sync = eglCreateSyncKHR(mEglDisplay,
-                EGL_SYNC_NATIVE_FENCE_ANDROID, nullptr);
-        if (sync == EGL_NO_SYNC_KHR) {
-            ALOGE("EglManager::createReleaseFence: error creating EGL fence: %#x",
-                    eglGetError());
-            return UNKNOWN_ERROR;
-        }
-        glFlush();
-        int fenceFd = eglDupNativeFenceFDANDROID(mEglDisplay, sync);
-        eglDestroySyncKHR(mEglDisplay, sync);
-        if (fenceFd == EGL_NO_NATIVE_FENCE_FD_ANDROID) {
-            ALOGE("EglManager::createReleaseFence: error dup'ing native fence "
-                    "fd: %#x", eglGetError());
-            return UNKNOWN_ERROR;
-        }
-        nativeFence = new Fence(fenceFd);
-        *eglFence = EGL_NO_SYNC_KHR;
-    } else if (useFenceSync && SyncFeatures::getInstance().useFenceSync()) {
-        if (*eglFence != EGL_NO_SYNC_KHR) {
-            // There is already a fence for the current slot.  We need to
-            // wait on that before replacing it with another fence to
-            // ensure that all outstanding buffer accesses have completed
-            // before the producer accesses it.
-            EGLint result = eglClientWaitSyncKHR(mEglDisplay, *eglFence, 0, 1000000000);
-            if (result == EGL_FALSE) {
-                ALOGE("EglManager::createReleaseFence: error waiting for previous fence: %#x",
-                        eglGetError());
-                return UNKNOWN_ERROR;
-            } else if (result == EGL_TIMEOUT_EXPIRED_KHR) {
-                ALOGE("EglManager::createReleaseFence: timeout waiting for previous fence");
-                return TIMED_OUT;
-            }
-            eglDestroySyncKHR(mEglDisplay, *eglFence);
-        }
-
-        // Create a fence for the outstanding accesses in the current
-        // OpenGL ES context.
-        *eglFence = eglCreateSyncKHR(mEglDisplay, EGL_SYNC_FENCE_KHR, nullptr);
-        if (*eglFence == EGL_NO_SYNC_KHR) {
-            ALOGE("EglManager::createReleaseFence: error creating fence: %#x", eglGetError());
-            return UNKNOWN_ERROR;
-        }
-        glFlush();
-    }
-    return OK;
-}
-
 } /* namespace renderthread */
 } /* namespace uirenderer */
 } /* namespace android */
diff --git a/libs/hwui/renderthread/EglManager.h b/libs/hwui/renderthread/EglManager.h
index 507673a..8e8bb8b 100644
--- a/libs/hwui/renderthread/EglManager.h
+++ b/libs/hwui/renderthread/EglManager.h
@@ -17,10 +17,8 @@
 #define EGLMANAGER_H
 
 #include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <SkRect.h>
 #include <cutils/compiler.h>
-#include <ui/Fence.h>
 #include <ui/GraphicBuffer.h>
 #include <utils/StrongPointer.h>
 
@@ -68,14 +66,6 @@
 
     EGLDisplay eglDisplay() const { return mEglDisplay; }
 
-    // Inserts a wait on fence command into the OpenGL ES command stream. If EGL extension
-    // support is missing, block the CPU on the fence.
-    status_t fenceWait(sp<Fence>& fence);
-
-    // Creates a fence that is signaled, when all the pending GL commands are flushed.
-    // Depending on installed extensions, the result is either Android native fence or EGL fence.
-    status_t createReleaseFence(bool useFenceSync, EGLSyncKHR* eglFence, sp<Fence>& nativeFence);
-
 private:
 
     void initExtensions();
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 65f95ad..c1284ec 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -178,7 +178,7 @@
         return;
     }
     mEglManager->initialize();
-    renderState().onContextCreated();
+    renderState().onGLContextCreated();
 
 #ifdef HWUI_GLES_WRAP_ENABLED
     debug::GlesDriver* driver = debug::GlesDriver::get();
@@ -200,7 +200,7 @@
 void RenderThread::destroyGlContext() {
     if (mEglManager->hasEglContext()) {
         setGrContext(nullptr);
-        renderState().onContextDestroyed();
+        renderState().onGLContextDestroyed();
         mEglManager->destroy();
     }
 }
diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp
index 0c49dc0..1517f57 100644
--- a/libs/hwui/renderthread/VulkanManager.cpp
+++ b/libs/hwui/renderthread/VulkanManager.cpp
@@ -40,7 +40,7 @@
 VulkanManager::VulkanManager(RenderThread& thread) : mRenderThread(thread) {}
 
 void VulkanManager::destroy() {
-    mRenderThread.renderState().onContextDestroyed();
+    mRenderThread.renderState().onVkContextDestroyed();
     mRenderThread.setGrContext(nullptr);
 
     if (VK_NULL_HANDLE != mCommandPool) {
@@ -404,7 +404,7 @@
         mSwapBehavior = SwapBehavior::BufferAge;
     }
 
-    mRenderThread.renderState().onContextCreated();
+    mRenderThread.renderState().onVkContextCreated();
 }
 
 // Returns the next BackbufferInfo to use for the next draw. The function will make sure all
@@ -981,22 +981,6 @@
     return surface->mCurrentTime - lastUsed;
 }
 
-status_t VulkanManager::fenceWait(sp<Fence>& fence) {
-    //TODO: Insert a wait on fence command into the Vulkan command buffer.
-    // Block CPU on the fence.
-    status_t err = fence->waitForever("VulkanManager::fenceWait");
-    if (err != NO_ERROR) {
-        ALOGE("VulkanManager::fenceWait: error waiting for fence: %d", err);
-        return err;
-    }
-    return OK;
-}
-
-status_t VulkanManager::createReleaseFence(sp<Fence>& nativeFence) {
-    //TODO: Create a fence that is signaled, when all the pending Vulkan commands are flushed.
-    return OK;
-}
-
 } /* namespace renderthread */
 } /* namespace uirenderer */
 } /* namespace android */
diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h
index ebc11a5..5524c39 100644
--- a/libs/hwui/renderthread/VulkanManager.h
+++ b/libs/hwui/renderthread/VulkanManager.h
@@ -23,8 +23,6 @@
 #include <vulkan/vulkan.h>
 
 #include <SkSurface.h>
-#include <ui/Fence.h>
-#include <utils/StrongPointer.h>
 #include <vk/GrVkBackendContext.h>
 
 class GrVkExtensions;
@@ -112,12 +110,6 @@
     // Presents the current VkImage.
     void swapBuffers(VulkanSurface* surface);
 
-    // Inserts a wait on fence command into the Vulkan command buffer.
-    status_t fenceWait(sp<Fence>& fence);
-
-    // Creates a fence that is signaled, when all the pending Vulkan commands are flushed.
-    status_t createReleaseFence(sp<Fence>& nativeFence);
-
 private:
     friend class RenderThread;