Merge "Remove xvpvnc console type tests"