Merge "Revert "Add developer setting to set the default GPU renderer.""