Merge "Don't restore stack when picking copy destination." into nyc-dev