Merge "Add WatchedItemIntegrationTest"