Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb4728 am: 6a8b5585 Change-Id: I0142ece58fb6e7029df4ef1345100d364a440022