adorokhine and Gerrit Code Review Merge "Rework threading and concurrency in AppSearchObserver." into a…