Merge "Allow disabling GL preload even if gfxdriver isn't updatable"