Merge "Fix EGL render tests on 5551."