Merge "watchlist: cleanup various method/variable names and comments in watchlist...