Save layout choice to saved graph file & previous session

When loading a graph from a file or from previous session, it would be nice to have the layout choice restored as well.

So we should save the layout choice in the graph file and in the previous session data, and restore that selection when loaded.

I'm combining them in to a single issue since I'm aware they are using the same logic and structure.