Merge "SearchManagerService made multi-user aware"