Merge "Use Diffusion for default Git Viewer"