Merge "Use getConnectionRef in WatchedItemStore"