am a587b890: Merge "ActivityChooser view not handling its removal and relayout...
am a587b890: Merge "ActivityChooser view not handling its removal and relayout properly." into jb-dev
* commit 'a587b890':
ActivityChooser view not handling its removal and relayout properly.