Merge "Avoid thread state races in EGL multithread tests"