Merge changes I50398940,I41c44699

* changes:
  SF: Delegate ICompositor interfacing to Scheduler
  gui: Evaluate ATRACE_FORMAT arguments lazily