Thanks @borski.
Mine has always behaved like bullet point #2, regardless of selecting North-Up.
However, I just tried something different that works ...
It's a two step process.
You click 2D or 3D map, then
You click North-Up
If you only click North-Up, without changing the map in step #1...