Merge changes Id23fafaf,I50450881

* changes:
  SF: Fix UAF due to outliving idle timer
  SF: Fix leak in unit tests