Merge "WatchedItemStore: Use callable type hint instead of Assert library"