SoldierDiaryOverviewState fixes and Master Merge

Makes diary maintain position after viewing mission and fixes scrollbar related bug.
Merges with latest Master.
Recreate Pull Request for better commit flow.