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

* commit 'a587b890bb0c2f800fe4dfd3267f26366d00d32c':
  ActivityChooser view not handling its removal and relayout properly.