Merge "Fix software GL renderer."