Merge "Require unlocked user for AppSearchImpl." into sc-dev