Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev