Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-mr1-dev