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

Change-Id: I85781c4fb776b4c1c0633721cc1c3bfd127d0b45