Demo rebased on master

Goal: make the current demo work based on VLC master+additional patches.

No additional feature or refactor required.

All issues for this milestone are closed. You may close this milestone now.