Factor out tracking for layers to LayerTrackFinder class