Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev