Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev