Merge branch 'llvm-cliptest-viewport'