Merge "watchlist: cleanup WatchedItemStore PhpStorm warnings"