Add --mark-watched feature (Closes #5054)