Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev