This removes static logic from WatchedItem into a class that we can slowly fill with watchlist database and storage things. This also removes the dual namespace handling in the new implementation. Change-Id: Ia67ab1d200ac393c65013b2091e61acefcb3defb
