Merge "Fix metadata surfacecontrol api/jni" into qt-dev