Merge "SF: Move/Refactor LayersNeedingFences"