Merge "ActivityChooserModel does not handle package changes on the thread that created it." into jb-dev