Merge "To avoid deleting a source file when a move opration is canceled" into nyc-andromeda-dev