Merge "Disable xenvncproxy and spicehtml5proxy"