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