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

Change-Id: I9e178a29010007c34a7cd482182dad64f1d6c8cb