task: #3581816 Move uses of Shortcut from Navigation to Shortcut

By: quietone By: smustgrave By: penyaskito By: dcam By: berdir By: alexpott By: godotislate By: longwave By: larowlan By: gábor hojtsy

Closes #3581816