merge branches/work/kaction-cleanup-branch: Simplify and clean up KShortcut