Disable xvnc unless required
Merge branch 'bugfix-remote-desktop'