I think even a cherrypick merge (if it sets an arrow in the checkin graph) can disrupt the renames.