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

Change-Id: I6fcf22a7a17772a780a12097e77015e3e2883e85