Merge changes from topics "presubmit-am-54728ad3f0014d59be7b146d10223f7f", "presubmit-am-effdf607213e46929e9d2fba03a41994" into tm-dev

* changes:
  SF: Generalize thread safety guards
  FTL: Add thread safety helpers