Merge "EGLAttrib requires special handling in JNI" into qt-dev