Settings: Notification Shortcuts (2/2)

Patchset 2: Added hide carrier label toggle, added multi-user support, fixed whitespace, cleanup of code.
Fix build with Notification Shortcuts
Moved Notification shortcuts / Icon swaps