Merge "Split getAppSearchImpl and createAppSearchImpl in AppSearchImpl" into sc-dev