backported r25520+25521
fixed: marking an item as watched jumps to beginning of list if "Hide Watched" is enabled
fixed: move to the next item instead of the one before when marking something as watched; thx moby-uk