Merge "Shortcut Helper - Connect interactor with system shortcuts" into main