Merge "Push chooser targets to the shortcut manager."