Merge "Fix metadata surfacecontrol api/jni" into qt-dev am: 96aaa9f237
am: cba56aca14

Change-Id: Ia8af53e3e8ebff3de763623098d521bc38a5ead8