Merge "Remove unnecessary invokation on AppSearch" into sc-dev