Merge "Remember mode and sort on per-directory basis." into klp-dev