Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev