But what that FAQ does not answer is: "Does the additional patent grant in the Facebook BSD+Patents license terminate if I sue Facebook because they violated one of my patents unrelated to the Facebook software?"

The answer to that one is, unfortunately, yes.