Merge "SF: Fix duplicate callbacks from mirrored layers" into sc-v2-dev