Merge "Avoid caching EGL_SINGLE_BUFFER layers" into tm-dev