Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev