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

Change-Id: I68cef7811c79e264c685fcaae30b501d29789af5