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

* commit 'b248077a8a239fe6fe28775a7472a89ff42fdec3':
  Fix bugs introduced in ChooserActivity