Merge "Follow-up Ifa9c55b7 (58852d8): Change one more item to getWatchedItem()"