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

Change-Id: I257ec5926d5261fd508f91e5a60911aa752f4b48