Merge "Add missing tests for some edge cases in WatchedItem::getNotificationTimestamp"