Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"