AUI-1173 Improve surface demo
Merge branch 'master' into master-deprecated