Merge "watchlist: make getLatestNotificationTimestamp() method use the correct user"