Merge "SF: Move/Refactor calculateWorkingSet to CompositionEngine"