Merge "Switch browser back to use Gpu upload path"