Merge "Convert WatchedItemQueryService to using getConnectionRef()"