Merge "Switch ServiceWatcher clients to fg thread"