am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev

* commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
  Fix bugs introduced in ChooserActivity