Bug 927204 - Cannot AddNamedRoot a nullptr, r=terrence
Automatic merge