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

Change-Id: I9bb129067af7cc69f3e29c6d16742ff241c1c71e