Merge "SF: Reparent for screehshots should only be called on old parent layers"