Pull state reporting changes into 1606_ox branch

And let's make this log.Debugf, since this isn't an error that affects the user's experience.