Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
am: 586f23c14b

Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d