Move "last sort" fields to user preferences so they are remembered between session.
Merge remote-tracking branch: upstream/master