[newFeature] add viewport for demo
Merge remote-tracking branch 'origin/master'