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

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