Merge changes I4f7e14be,I3934b901

* changes:
  SF: Group mutex-guarded scheduler feature state
  SF: Deduplicate scheduler timer callbacks