Merge "Keep original thread name when attaching JNI thread for easier debugging"