Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev