Merge "EGL cleanup tests"