Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities.""