Merge "Fix ChooserTarget app scoring" into mnc-dr-dev