Merge "Split getInstance and createInstance in AppSearchImpl"