Merge changes from topic "presubmit-am-5b736da41d414f9989fab9a41f2ed807" into tm-dev

* changes:
  SF: Simplify setTransactionFlags
  SF: Remove ISchedulerCallback::scheduleComposite