Fix model test app after merge
Merge branch 'gltf' into gltf-dev3