I am now thinking it was something else (maybe a loose connector or a bad solder connection in the overhead unit for the passenger airbag).

It's going to get that connector pulled again.