Merge "Add id field to watchlist db table"