Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev