Merge "Fix appsearch filegroups to match package" into sc-dev