Merge "Destroy the EGL surface when the ViewRootImpl surface is invalid Bug #5109839"