Merge "Add appsearch multiuser test" into sc-dev