bugfix: show "kesken" if appropriate even if a preference has been canceled
refactor
Merge branch 'replace-valintatulosservicemock'