Merge "Fix duplicate entries in ChooserActivity" into nyc-mr1-dev