Merge changes I9b7de789,I02845405

* changes:
  SF: Update CompositionInfo during calculation
  SF: Make message refresh loop over displays