Merge changes Id305effe,I065f1968,I18b6d921 into sc-dev

* changes:
  SF: Only buildCachedSets if (mergeWithCachedSets)
  Remove Flattener::mLayersHash
  Mark CachedSet::mFingerprint as const