Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev