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

Change-Id: I13a0dd37dfb4475866535abb514aa4a8dcd2f6a6