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

Change-Id: I43302d90f7aa2c174c5e31cd5390e03c3c087157