Merge "Avoid a race condition on reading qemu.gles property"