Merge "Fix for native bridge fallback in egl layers"